Squash merged with master.