Merged to [master](https://git-wip-us.apache.org/repos/asf?p=jclouds.git;a=search;s=Andrew+Phillips;st=author).
@nacx: Also backport to 1.9.x? --- Reply to this email directly or view it on GitHub: https://github.com/jclouds/jclouds/pull/721#issuecomment-91238084
