Merging RC2 work into master

RC2 is stable enough to merge into master. Yay!