Some tweaks in the march up to 2.0 final.
Fixed merge conflict