Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Mon, 1 Oct 2018 04:06:24 +0000 (14:06 +1000)
committerCampbell Barton <ideasman42@gmail.com>
Mon, 1 Oct 2018 04:06:24 +0000 (14:06 +1000)

Trivial merge