Fix build warnings from gcc 4.8
Merge pull request #879 from apavlenko:gcc-4.8