C++11 is not everywhere, so be wise

Change-Id: I5935caa1d3c54bc9becd01a96499ca9158ea468c