[Bf-blender-cvs] [bf4cbf1] testbuild: Merge branch 'master' into testbuild

[Bastien Montagne]

Commit: bf4cbf10bbb729ba1ee388f1c8198789dcc5b5c3
Author: Bastien Montagne
Date:   Tue Aug 26 12:32:29 2014 +0200
Branches: testbuild
https://developer.blender.org/rBbf4cbf10bbb729ba1ee388f1c8198789dcc5b5c3

Merge branch 'master' into testbuild

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



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