Merge change 1365

* changes:
  Remove all gcc warnings.