Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Mon, 11 Jun 2018 08:46:33 +0000 (10:46 +0200)
committerCampbell Barton <ideasman42@gmail.com>
Mon, 11 Jun 2018 08:46:33 +0000 (10:46 +0200)

Trivial merge