fall back to embedded credentials when custom ID and secret are not both set in the environment
Merge branch 'rakyll'