refs #656 - seem work in production environment
Merge branch 'dev' of https://github.com/projestimate/projestimate into dev