Merge branch 'pull/1765'
authorAndy Allan <git@gravitystorm.co.uk>
Fri, 9 Mar 2018 07:57:24 +0000 (15:57 +0800)
committerAndy Allan <git@gravitystorm.co.uk>
Fri, 9 Mar 2018 07:57:24 +0000 (15:57 +0800)

Trivial merge