Fix problem on PHP < 5.5 (#831)
Merge branch 'development' of https://github.com/jemproject/JEM-Project into development