This is probably the final commit to 1.0.