Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Mon, 14 May 2018 07:01:07 +0000 (09:01 +0200)
committerCampbell Barton <ideasman42@gmail.com>
Mon, 14 May 2018 07:01:11 +0000 (09:01 +0200)

Trivial merge