[Bf-blender-cvs] [88040b9] missing-libs: Merge branch 'master' into missing-libs

[Campbell Barton]

Commit: 88040b928c4fc942a02b93946c4b32585a1ac902
Author: Campbell Barton
Date:   Tue Oct 20 17:41:12 2015 +1100
Branches: missing-libs
https://developer.blender.org/rB88040b928c4fc942a02b93946c4b32585a1ac902

Merge branch 'master' into missing-libs

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



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