[Bf-blender-cvs] [f9d7ff4d2db] soc-2017-normal-tools: Merge branch 'master' into soc-2017-normal-tools

[Bastien Montagne]

Commit: f9d7ff4d2dbaad1d7f137c15a23bd8b8d16266a4
Author: Bastien Montagne
Date:   Thu Oct 12 16:56:58 2017 +0200
Branches: soc-2017-normal-tools
https://developer.blender.org/rBf9d7ff4d2dbaad1d7f137c15a23bd8b8d16266a4

Merge branch 'master' into soc-2017-normal-tools

Conflicts:
	intern/cycles/device/device.cpp

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



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