Merged from mspsim:master