Merge branch 'origin/master'
Filtering images of an importbatch by trashState (in, out, any)