[boost] boost/algorithm/string/regex.hpp unmerged change?