enyojs/moonstone — pull request #1847 by aarontam (2014-12-18 18:40:20+00:00)
Title: ENYO-577 (2.5)

Cherry-picking https://github.com/enyojs/moonstone/pull/1835 into `2.5-upkeep`, creating a PR for tracking purposes.