Merge remote-tracking branch 'upstream/master'
Transformed csv mask files to the raw format so they can be
used with the existing code.
Added mp6
Merge remote-tracking branch 'upstream/master'