enyojs/moonstone — pull request #1839 by ryanjduffy (2014-12-12 19:23:16+00:00)
Title: Fixes ENYO-654 in 2.5

Updating 2.5 with PR #1837

Enyo-DCO-1.1-Signed-off-by: Aaron Tam