Merge branch 'trunk' into docs/ec2-custom-ami-image-name