Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Thu, 17 May 2018 17:55:27 +0000 (19:55 +0200)
committerCampbell Barton <ideasman42@gmail.com>
Thu, 17 May 2018 17:55:27 +0000 (19:55 +0200)

Trivial merge