non-ASCII name=""/filename="" support
auto-merge staging into master