reintegrated update from fork https://github.com/cormacrelf/theme-foundation/