Latest commits from 6/12 afternoon