Appease Fog's option validation.
Merge branch 'iam-roles' into version-bump