Various tweaks
Merge branch 'master' into nm-20140725-updates

* master:
  Various tweaks