updated for MP6
(cherry picked from commit 4303fa88b86a3e63a88bd17943f4e86772807181)
updated to work with the MP6 test data
Merge remote-tracking branch 'upstream/master'
Merge branch 'iemejia-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'