Adding override qualifiers.
Merge remote-tracking branch 'upstream/cpp11' into cpp11