Fixed debugging constructor error
Merge branch 'upstream_changes' of https://github.com/bwall/ec2-plugin.git into upstream_changes