Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Tue, 19 Jun 2018 06:15:03 +0000 (08:15 +0200)
committerCampbell Barton <ideasman42@gmail.com>
Tue, 19 Jun 2018 06:15:03 +0000 (08:15 +0200)

Trivial merge