Fix incorrect test name.  Fixes #635
Merge branch 'master' into 2.2