Merge remote-tracking branch 'remotes/mjt/tags/pull-trivial-patches-2015-04-04' into...