Merge pull request #134 from dwilkie/fix_broken_test

fix test that fails in November
Merge branch 'upstream'