Initial import of 1.0.7.