master commit of outstanding changes from Fall 2012