Merge branch 'master' into develop

* master:
  Revert 7d990a7..8a48d5a