am 65e1c48d: Merge "Don\'t allow int<->pointer conversions."

* commit '65e1c48df095b2af53340ab55f687d5b1c638d66':
  Don't allow int<->pointer conversions.