ENYO-591 (2.5)

Merging https://github.com/enyojs/enyo/pull/951 into `2.5-upkeep`, opening a PR for tracking purposes.