[Bf-blender-cvs] [ef5589c32d] app-templates: Merge branch 'master' into app-templates

[Campbell Barton]

Commit: ef5589c32d3fec669d5e0a53ce724f066b7d9929
Author: Campbell Barton
Date:   Fri Mar 24 07:04:57 2017 +1100
Branches: app-templates
https://developer.blender.org/rBef5589c32d3fec669d5e0a53ce724f066b7d9929

Merge branch 'master' into app-templates

===================================================================



===================================================================