Merge remote-tracking branch 'remotes/mjt/tags/trivial-patches-2014-06-24' into staging