Fix for warnings-as-errors, from Jamie.
My local patch for warning fix
Merge remote-tracking branch 'samsk/master'