Reapply changes introduced in 42e49d523a89c1a9af1f0e3e841bec67d949d510
Reapply changes introduced in 42e49d523a89c1a9af1f0e3e841bec67d949d510

In the recent merge, we took the wrong version of this file.
This commit reintroduces the fixes from that earlier commit.

fzadow/CATMAID,htem/CATMAID,htem/CATMAID,fzadow/CATMAID,htem/CATMAID,fzadow/CATMAID,fzadow/CATMAID,htem/CATMAID