Merged a pull request from master

https://github.com/zurb/joyride/pull/84