replaced some 'std::' with 'extra::' in comments
Merge remote-tracking branch 'reusee/master' into HEAD