Commits in ties448/asmesim-2016:20160405orig