Make ticket types more clear
Merge branch 'master' into gh-pages