Merge unity-staging -> unity-trunk

Pick up changes from the last bug bash week.