Merging: https://github.com/aws/opsworks-cookbooks/pull/16