Merge "silent one more compiler warning"