[MERGE] Merge from lp:addons-vauxoo/trunk