[Bf-blender-cvs] [780d257] gooseberry: Merge branch 'master' into gooseberry

[Sergey Sharybin]

Commit: 780d257e6e2b5c114fc0d17d5f29d41c03dbb2c7
Author: Sergey Sharybin
Date:   Wed Apr 8 20:21:02 2015 +0500
Branches: gooseberry
https://developer.blender.org/rB780d257e6e2b5c114fc0d17d5f29d41c03dbb2c7

Merge branch 'master' into gooseberry

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



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