[Bf-blender-cvs] [c262f36] soc-2016-cycles_images: Merge branch 'master' into soc-2016-cycles_images

[Thomas Dinges]

Commit: c262f36f8d56f72aeac12e1ed62f8088b2ccc2d4
Author: Thomas Dinges
Date:   Fri Jul 1 21:24:36 2016 +0200
Branches: soc-2016-cycles_images
https://developer.blender.org/rBc262f36f8d56f72aeac12e1ed62f8088b2ccc2d4

Merge branch 'master' into soc-2016-cycles_images

Overwrite branch specific changes, make it match vanilla master again. Have to re-think some of that half stuff there.

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



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