Manthan Commit 28-05-13
Merge branch 'manthan'