Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Mon, 18 Jun 2018 16:55:12 +0000 (18:55 +0200)
committerCampbell Barton <ideasman42@gmail.com>
Mon, 18 Jun 2018 16:55:12 +0000 (18:55 +0200)

Trivial merge