allows building with -std=c++11 under G++
Merge pull request #534 from emchristiansen:c++11