Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Fri, 27 Jul 2018 01:01:01 +0000 (11:01 +1000)
committerCampbell Barton <ideasman42@gmail.com>
Fri, 27 Jul 2018 01:01:01 +0000 (11:01 +1000)

Trivial merge