Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Mon, 19 Mar 2018 10:17:52 +0000 (11:17 +0100)
committerCampbell Barton <ideasman42@gmail.com>
Mon, 19 Mar 2018 10:17:52 +0000 (11:17 +0100)

Trivial merge