fixing issue 221
added a testcase for github issue 221
Merge branch 'master' into tim/merge-master-to-1.9