apurva's commit on 6-2-2013 (all migrations and test done)