Merge change 9407

* changes:
  Fix parsing of function declarations that return pointers.