From: Campbell Barton <ideasman42@gmail.com>
Date: Fri, 8 Dec 2017 01:59:51 +0000 (+1100)
Subject: Merge branch 'master' into blender2.8
X-Git-Tag: v2.80-rc1~13556
X-Git-Url: https://git.blender.org/gitweb/gitweb.cgi/blender.git/commitdiff_plain/82c779462d13bdf39bc74631db510f165e7a8f2d

Merge branch 'master' into blender2.8
---

82c779462d13bdf39bc74631db510f165e7a8f2d