[Bf-blender-cvs] [41b8fe9] soc-2016-cycles_denoising: Merge remote-tracking branch 'origin/master' into soc-2016-cycles_denoising

[Lukas Stockner]

Commit: 41b8fe9e9e6d2d494473771a213a3ecba3b5e5cd
Author: Lukas Stockner
Date:   Tue Jul 26 03:37:09 2016 +0200
Branches: soc-2016-cycles_denoising
https://developer.blender.org/rB41b8fe9e9e6d2d494473771a213a3ecba3b5e5cd

Merge remote-tracking branch 'origin/master' into soc-2016-cycles_denoising

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



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