Erik Erikson 2a5cbcc07e Merge branch 'master' into reduce-scope-of-rights-of-default-iamlambdarole
# Conflicts:
#	lib/plugins/aws/deploy/compile/functions/index.js
#	lib/plugins/aws/deploy/compile/functions/tests/index.js
2016-10-04 16:25:44 -07:00
..