Potential merge with rwfilice#6

rwfilice wants to merge 12 commits into

sgp715:mastersgp715/simple_image_annotator:masterfrom

rwfilice:masterrwfilice/simple_image_annotator:masterCopy head branch name to clipboard