Merge branch 'master' into aho-corasick

... to resolve some simple conflicts.
12 jobs for aho-corasick
in 16 minutes and 59 seconds and was queued for 17 seconds