Merge branch 'master' into development
Merge remote-tracking branch 'internal/public_right_aws' into development
acu81709 - version bump
Merge pull request #162 from rightscale/development

Development