[Bf-blender-cvs] [e3c00a6] soc-2016-uv_tools: Merge remote-tracking branch 'origin/master' into soc-2016-uv_tools

[Phil Gosch]

Commit: e3c00a6ead0b92d345e93a1c42e92b9d03d174ef
Author: Phil Gosch
Date:   Fri Nov 4 08:27:46 2016 +0100
Branches: soc-2016-uv_tools
https://developer.blender.org/rBe3c00a6ead0b92d345e93a1c42e92b9d03d174ef

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

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



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