Merge branch 'release/1.5' into develop
Merge branch 'develop' of github.com:openeyes/OphCiExamination into develop