Final changes prior to tagging as 2.0