Merge branch 'master' into master
authorGlenn Hevey <glenn.hevey@gmail.com>
Mon, 11 Dec 2017 10:25:06 +0000 (21:25 +1100)
committerGitHub <noreply@github.com>
Mon, 11 Dec 2017 10:25:06 +0000 (21:25 +1100)

Trivial merge