thesaurus mapping 'mapped' style
Merge remote-tracking branch 'origin/master'