3.1 compatibility merge, moving the current state to the 2.0 branch.