Merge remote-tracking branch 'remotes/mjt/tags/pull-trivial-patches-2016-05-18' into...