fixes #206
Merge branch 'fix-206'
Merge branch 'master' into 5.1.x