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

[Campbell Barton]

Commit: b3b178af8644d4fffbbceb29635e9320683e6d5d
Author: Campbell Barton
Date:   Sat Mar 25 09:20:30 2017 +1100
Branches: app-templates
https://developer.blender.org/rBb3b178af8644d4fffbbceb29635e9320683e6d5d

Merge branch 'master' into app-templates

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



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