Merge branch 'master' into dev

* master:
messed-up apply my fix
Merge branch 'dev'

* dev:
  messed-up apply my fix