am 349ef841: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge

* commit '349ef841374a0dc016883e7bb7260b988b6a0c7c':
tree: ee10c8bd8d5f662827800d33398c931497d762b7
  1. tests/