Merge pull request #2236 from hochhaus/master

Silence compile warnings in bazel