Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Fri, 15 Jun 2018 08:25:41 +0000 (10:25 +0200)
committerCampbell Barton <ideasman42@gmail.com>
Fri, 15 Jun 2018 08:25:41 +0000 (10:25 +0200)

Trivial merge