merge -r151658:151801 from mono-2-6 branch