Merge pull request #27 from avasquez614/master

Fixed issue with persona not being resolved.
Fix CRAFTERCMS-847
See issue for further instructions
Merge pull request #28 from cortiz/master

Fix CRAFTERCMS-847
Merge branch 'master' of https://github.com/craftercms/engine