enyojs/moonstone — pull request #1841 by aarontam (2014-12-12 22:25:42+00:00)
Title: ENYO-422 (2.5)

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