consolidating cxx03 and cxx11-related branches