Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Sun, 1 Jul 2018 05:24:46 +0000 (07:24 +0200)
committerCampbell Barton <ideasman42@gmail.com>
Sun, 1 Jul 2018 05:24:46 +0000 (07:24 +0200)

Trivial merge