Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Wed, 17 Oct 2018 00:26:59 +0000 (11:26 +1100)
committerCampbell Barton <ideasman42@gmail.com>
Wed, 17 Oct 2018 00:26:59 +0000 (11:26 +1100)

Trivial merge