Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Wed, 26 Sep 2018 01:42:38 +0000 (11:42 +1000)
committerCampbell Barton <ideasman42@gmail.com>
Wed, 26 Sep 2018 01:42:38 +0000 (11:42 +1000)

Trivial merge