Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Tue, 24 Jul 2018 05:35:01 +0000 (15:35 +1000)
committerCampbell Barton <ideasman42@gmail.com>
Tue, 24 Jul 2018 05:35:01 +0000 (15:35 +1000)

Trivial merge