Merge branch 'trunk' into libcloud_910