Fix #408 for good
Merge branch 'master' into next

* master:
  Fix #408 for good