Merge changes from Caleb Phillips.