Improve memory usage on newer php versions
Merge branch 'master' of github.com:flack/openpsa