1.7 again
Merge branch 'master' into coffeeready

* master:
  1.7 again