artf724576 - Fixed
Merge branch 'master' of https://github.com/phresco/framework
artf724576-fixed