look for JPG(windows mounts) and jpg
Merge branches 'master' and 'current'