am a1229241: Bug fixes. automerge: 41e8870

* commit 'a1229241ac2b57e0fc316d8e97026b10f4bdea2e':
  Bug fixes.
tree: 4b825dc642cb6eb9a060e54bf8d69288fbee4904

This tree is empty.