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

* commit '21af84d3e4bf82e9dd8b5087b60630f29668bda3':
  Don't break error string (easier grepping)