[master] Changes to remove gcc warnings (John Bowler)
8 files changed