Merge branch 'master' into Eran
Add Ticket Type Count Hash to stats
Merge branch 'Eran'