Merge branch 'blender2.7' of git.blender.org:blender
authorStefan Werner <stefan.werner@tangent-animation.com>
Thu, 14 Mar 2019 10:47:27 +0000 (11:47 +0100)
committerStefan Werner <stefan.werner@tangent-animation.com>
Thu, 14 Mar 2019 10:47:27 +0000 (11:47 +0100)

Trivial merge