Fixed issue with showcatcher not creating folders.
Merge branch 'master' into beta