Shortcat 0.6.4
Merge pull request #2124 from Cottser/shortcat-0.6.4

Shortcat 0.6.4