fixing clang -pedantic warnings
Merge commit '0c5c538113914126948563f0da62ed9842091c1a'