Merge branch 'patch-1' of https://github.com/vivekkiran/socorro-1