merge-changes

Diogo Silva

@dbtdsilva

59ec9cb0 · cloudprovider: renamed functions for serializing and unserializing · Jul 07, 2017

Merged changes from the main fork at this point