Maybe fixes some bugs in ec2...
Merge remote-tracking branch 'origin/master'