Merge from master: eliminate warnings from the compiler.