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

[Phil Gosch]

Commit: bd9978519b289e621047e1ca6c1776cbacdf3a2c
Author: Phil Gosch
Date:   Fri Jul 15 13:17:45 2016 +0200
Branches: soc-2016-uv_tools
https://developer.blender.org/rBbd9978519b289e621047e1ca6c1776cbacdf3a2c

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

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



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