Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Mon, 20 Aug 2018 07:53:53 +0000 (17:53 +1000)
committerCampbell Barton <ideasman42@gmail.com>
Mon, 20 Aug 2018 07:53:53 +0000 (17:53 +1000)

Trivial merge