Merge branch 'master' into images
authorAdrian Iain Lam <adrianiainlam@users.noreply.github.com>
Thu, 8 Nov 2018 21:59:47 +0000 (21:59 +0000)
committerAdrian Iain Lam <adrianiainlam@users.noreply.github.com>
Thu, 8 Nov 2018 21:59:47 +0000 (21:59 +0000)

Trivial merge