see mantis 3914
Merge branch 'geworkbench_2_6_0' of https://github.com/geworkbench-group/geworkbench-components into geworkbench_2_6_0