Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Fri, 13 Jul 2018 07:05:55 +0000 (09:05 +0200)
committerCampbell Barton <ideasman42@gmail.com>
Fri, 13 Jul 2018 07:05:55 +0000 (09:05 +0200)

Trivial merge