merge from open-source master
tree: f15163e716ba519dacf9eb102c07ecb27e533103
  1. tests/