am d00eba45: merge from open-source master

Merge commit 'd00eba458706a38f6c072ed90c5da35f3e3f1bba' into kraken

* commit 'd00eba458706a38f6c072ed90c5da35f3e3f1bba':
  Add a printf format.