Merge branch 'master' into blender2.8
authorAntonio Vazquez <blendergit@gmail.com>
Thu, 13 Jul 2017 16:05:20 +0000 (18:05 +0200)
committerAntonio Vazquez <blendergit@gmail.com>
Thu, 13 Jul 2017 16:05:20 +0000 (18:05 +0200)

Trivial merge