0.18 branch for archival purposes, has been merged into master.