Merged updates from qgiscloud plugin