Merge branch 'patches' into pu
authorPat Thoyts <patthoyts@users.sourceforge.net>
Mon, 3 Oct 2016 22:28:57 +0000 (23:28 +0100)
committerPat Thoyts <patthoyts@users.sourceforge.net>
Mon, 3 Oct 2016 22:28:57 +0000 (23:28 +0100)
Trivial merge