Merge branch 'master' into blender2.8
authorAntonio Vazquez <blendergit@gmail.com>
Thu, 22 Mar 2018 18:21:36 +0000 (19:21 +0100)
committerAntonio Vazquez <blendergit@gmail.com>
Thu, 22 Mar 2018 18:21:36 +0000 (19:21 +0100)

Trivial merge