merge changes from master into ec2test branch