pull in latest 1.12 branch commits
Rex Dieter • 9 years ago