Z2 didn't recognize file filter "file/*" so changed to */*
Merge remote-tracking branch 'origin/master'