Merged changes from SESI for compatibility with C++11 compilers.