Minor stuff
Merge branch 'master' into custom

* master:
  Minor stuff