enyojs/enyo — pull request #936 by aarontam (2014-11-20 00:52:09+00:00)
Title: ENYO-345 (master)

Cherry-picking from `2.5.1-release` into `master`, creating PR for tracking purposes.