Merge branch 'master' into appveyor
authorJared Mulconry <jaredmulconry@gmail.com>
Sat, 7 Oct 2017 14:34:02 +0000 (00:34 +1000)
committerGitHub <noreply@github.com>
Sat, 7 Oct 2017 14:34:02 +0000 (00:34 +1000)

Trivial merge