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

[Phil Gosch]

Commit: a732f96919e5711070c55d9248c8f7479fdf942c
Author: Phil Gosch
Date:   Thu Jun 2 22:22:33 2016 +0200
Branches: soc-2016-uv_tools
https://developer.blender.org/rBa732f96919e5711070c55d9248c8f7479fdf942c

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

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



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