MATM fixes in 2.1.0#441

Merged

pabloruiz55 merged 5 commits intodev-2.1.0from

Nov 29, 2018

Commits on Nov 28, 2018

resolve conflicts in changelog

satyamakgec
authored and
SatyamSB
committed
resolve conflicts in readme

pabloruiz55
authored and
SatyamSB
committed
Update README.md

pabloruiz55
authored and
SatyamSB
committed
minor fix in readme to reset the MATM
SatyamSB
committed

Commits on Nov 29, 2018

Merge branch 'dev-2.1.0' into matm-fixes
pabloruiz55
authored