Merge in 2.0.5 from master