[ChrisClark13] Commiting before converting to 1.6