merged from boost-log repo