mantis issue 3658 (github issue #18)
Merge branch 'master' of https://github.com/geworkbench-group/geworkbench-web.git