Merge branch 'issue896' into 1.7.x