Added 2.0.2-branch changes (r1389) to trunk