Merge remote-tracking branch 'remotes/mjt/tags/pull-trivial-patches-2014-11-02' into...