Changes to Doctesting-2017b