enyojs/enyo — pull request #987 by aarontam (2014-12-31 17:11:56+00:00)
Title: ENYO-726: Adding fix for ENYO-653

Cherry-picking changes from https://github.com/enyojs/enyo/pull/965 into `2.5.1-release`, creating a PR for tracking purposes.