Initial commit, mirroring version 2.18.