Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Tue, 14 Aug 2018 00:02:05 +0000 (10:02 +1000)
committerCampbell Barton <ideasman42@gmail.com>
Tue, 14 Aug 2018 00:02:05 +0000 (10:02 +1000)

Trivial merge