Merge "Fix one gcc compiler warning"