Fixes aurajs/aura#204

Changes related to aurajs/aura#245
Merge pull request #248 from dotCypress/issues/204

Fixes aurajs/aura#204
Merge remote-tracking branch 'upstream/master'