r3684: syncing up some changes for 3.0.9