mantis issue 3821
Merge branch 'master' of https://github.com/geworkbench-group/geworkbench-web into aracne