prepare new dev iteration
Merge branch '1.7.x' into issue860
git push origin 1.7.x --forceMerge branch 'issue860' into 1.7.x