Initial import of version v1.0+r23.