[OE-2557] epic fail
Merge branch 'jira/2557' into feature/orbis
Merge branch 'feature/orbis' of github.com:openeyes/OpenEyes into feature/orbis