gii tweaks and bugfixes
Merge branch 'release/1.2-moorfields' into feature/glaucoma