Fix for NBIA-680 and NBIA-679
Merge branch 'master' of https://github.com/NCIP/national-biomedical-image-archive