1.7 again
Merge branch 'master' into clean

* master:
  1.7 again