Merge pull request #1 from InMobi/master

Reverse merge