Merge branch 'master' into Eric

change two_points_made