Merge remote branch 'origin/rel-16r5' into rel-16r5-null-merge
Rohan Somvanshi [Mon, 10 Sep 2012 13:27:33 +0000 (18:27 +0530)]

Trivial merge