Merge changes from brianjstafford-master