Merge pull request #55 from pratik-joshi/CRM-11960-webtest