We're merging the rearchitecture branch into trunk this weekend. Don't check anything in there until further notice.
Trunk merging is now complete.
