silence a compiler warning on older gcc versions (4.6)
Merge branch 'master' into ci