Merge in fixes to stable.