1.6 codebase. This is still untested, so depending on any problems found, and assuming it eventually makes into the main branch, we might rebase it before the merge.
