Minor fix for C++11-ism.
Merge branch 'master', remote branch 'origin'