Merge "Revert "Update master for stable/stein""