Merge branch 'master' into images
authorAdrian Iain Lam <adrianiainlam@users.noreply.github.com>
Fri, 23 Nov 2018 00:25:46 +0000 (00:25 +0000)
committerAdrian Iain Lam <adrianiainlam@users.noreply.github.com>
Fri, 23 Nov 2018 00:25:46 +0000 (00:25 +0000)

Trivial merge