Added mapping files that were somehow wrongly deleted.
Merge remote-tracking branch 'upstream/master'