[Bf-blender-cvs] [0853c01] gooseberry: Merge branch 'master' into gooseberry

[Antony Riakiotakis]

Commit: 0853c0109c5cbddfcd809b17aba937e3baf55f9e
Author: Antony Riakiotakis
Date:   Thu Nov 20 18:21:39 2014 +0100
Branches: gooseberry
https://developer.blender.org/rB0853c0109c5cbddfcd809b17aba937e3baf55f9e

Merge branch 'master' into gooseberry

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



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