061913 master commit