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

[Phil Gosch]

Commit: a671816e57383d095aa446d3986e6a80c8b4d60f
Author: Phil Gosch
Date:   Sun Jun 19 19:32:29 2016 +0200
Branches: soc-2016-uv_tools
https://developer.blender.org/rBa671816e57383d095aa446d3986e6a80c8b4d60f

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

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



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