Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Thu, 7 Jun 2018 12:58:57 +0000 (14:58 +0200)
committerCampbell Barton <ideasman42@gmail.com>
Thu, 7 Jun 2018 12:58:57 +0000 (14:58 +0200)

Trivial merge