2.0 RC2

Includes bug fixes and changes for RC2.