fix failing test
Merge branch 'issue822' into 2.0.x
Merge remote-tracking branch 'origin/2.0.x' into 2.0.x