[Bf-blender-cvs] [216a099] gooseberry: Merge branch 'master' into gooseberry

[Antony Riakiotakis]

Commit: 216a0993cd9ee871b82db201a336640cd571c556
Author: Antony Riakiotakis
Date:   Thu Apr 9 12:49:45 2015 +0200
Branches: gooseberry
https://developer.blender.org/rB216a0993cd9ee871b82db201a336640cd571c556

Merge branch 'master' into gooseberry

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



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