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

[Campbell Barton]

Commit: b3d623230b3e3e7b7b07d2d4a4b08bb61f92e15b
Author: Campbell Barton
Date:   Sat Mar 25 10:06:59 2017 +1100
Branches: app-templates
https://developer.blender.org/rBb3d623230b3e3e7b7b07d2d4a4b08bb61f92e15b

Merge branch 'master' into app-templates

All important changes are now in master, this just syncs the branch.

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



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