Merge branch 'onepointfivecompat'
Merge branch 'master' of https://github.com/bishless/chevrons