[Merge] ~3v1n0/unity:use-upstream-nautilus-features into unity:master

[Marco Trevisan (Treviño)]

The proposal to merge ~3v1n0/unity:use-upstream-nautilus-features into unity:master has been updated.

    Status: Needs review => Approved

For more details, see:
https://code.launchpad.net/~3v1n0/unity/+git/unity/+merge/403570
-- 
Your team Unity Team is requested to review the proposed merge of ~3v1n0/unity:use-upstream-nautilus-features into unity:master.