Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Sat, 10 Nov 2018 09:02:33 +0000 (20:02 +1100)
committerCampbell Barton <ideasman42@gmail.com>
Sat, 10 Nov 2018 09:02:33 +0000 (20:02 +1100)

Trivial merge