Merge branch 'mtextarea_update'
Merge branch 'master' of https://github.com/jdryan1/maddon