am cddd3119: am 4c2e9ab9: Merge "Fixed another crash with HUNs" into mnc-dev

* commit 'cddd311948123a5a052aa0fd8ff3efa151df9617':
  Fixed another crash with HUNs