enyojs/moonstone — pull request #1878 by aarontam (2014-12-30 02:15:09+00:00)
Title: ENYO-700 (2.5)

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