Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Mon, 16 Apr 2018 05:39:47 +0000 (07:39 +0200)
committerCampbell Barton <ideasman42@gmail.com>
Mon, 16 Apr 2018 05:39:56 +0000 (07:39 +0200)

Trivial merge