Bugfix for filenames with commas. Fixes #278
Merge branch 'beta' into homepage_refresh_2.0