Backport https://github.com/rcbops-cookbooks/horizon/issues/94
Merge pull request #103 from andymcc/folsom

Merged automatically by jenkins after successful build test