Fixed: Wrong regexp
Merge branch 'upstream-master' into apache-vlogger