Merge branch '05072013.1' of https://github.com/ellensilva/MarketplaceTests into 05072013.1
Merge branch 'master' of https://github.com/ellensilva/MarketplaceTests