1.6 fixes. Last commit before switching to develop branch
1.6 fixes. Last commit before switching to develop branch

FiviumAustralia/OpenEyes,FiviumAustralia/OpenEyes,FiviumAustralia/OpenEyes,FiviumAustralia/OpenEyes,FiviumAustralia/OpenEyes