1.2 rc2

Includes latest merge from nightly