RESOLVED: http://developer.raikes-ds.com/jira/browse/PRTLP-14
Merge branch 'develop' of https://github.com/icotting/Phocalstream into develop