Fix for make clean
Merge branch 'master' into remove_subimage
Add in missing file