am 9b0bd2b3: Merge "Add casts to avoid build warnings with gcc-4.7"

* commit '9b0bd2b32061e852c3233f6784e974b5226c5821':
  Add casts to avoid build warnings with gcc-4.7