merged at [master](http://git-wip-us.apache.org/repos/asf/jclouds/commit/4ae2d208) and [2.0.x](http://git-wip-us.apache.org/repos/asf/jclouds/commit/663123a9)
thanks @nacx for reviewing it! -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/jclouds/jclouds/pull/1058#issuecomment-277729788
