am 7a9f771f: Merge "Don\'t break error string (easier grepping)" into mnc-ub-dev

* commit '7a9f771fe010c697c6a9fb143f0a26778d440c8c':
  Don't break error string (easier grepping)