1.1: Update for 2.0 final