Merging 1.1 code into MesquiteProject: master