Merge minor post 1.1.3-RC2 changes.