fixed up file/image testing
ticked version up to 1.10.7
Merge remote-tracking branch 'wagn/master' into wagn_master