Merge branch '1.7.x' into issue891
Merge branch 'issue891' into 1.7.x