fix problem with matches mapping
Merge remote-tracking branch 'remotes/origin/0.4.0' into 0.4.0