Fixes Fixed issue with -# (filename-as-tag) flag when __FILE__ expands into filename without directories (#2328, #2393) Fixed CAPTURE macro not being variadic when disabled through CATCH_CONFIG_DISABLE (#2316, #2378)