Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Sun, 17 Jun 2018 13:52:32 +0000 (15:52 +0200)
committerCampbell Barton <ideasman42@gmail.com>
Sun, 17 Jun 2018 13:52:32 +0000 (15:52 +0200)

Trivial merge