[Bf-blender-cvs] [e9aa0a6] experimental-build: Merge branch 'master' into experimental-build

[Bastien Montagne]

Commit: e9aa0a636b0451c8dd46188525624f5ae7429921
Author: Bastien Montagne
Date:   Thu May 7 19:32:10 2015 +0200
Branches: experimental-build
https://developer.blender.org/rBe9aa0a636b0451c8dd46188525624f5ae7429921

Merge branch 'master' into experimental-build

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



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