MERGE https://github.com/enyojs/enyo/pull/486 FIRST