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

[Campbell Barton]

Commit: 2a1a16dca5b55b8feb55b52c7a67f2e993070148
Author: Campbell Barton
Date:   Sat Mar 18 17:37:39 2017 +1100
Branches: app-templates
https://developer.blender.org/rB2a1a16dca5b55b8feb55b52c7a67f2e993070148

Merge branch 'master' into app-templates

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



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