am e3f5f497: (-s ours) am 83bf8d16: am 88d97250: Prepare for doc package update in rev 2. do not merge.

* commit 'e3f5f497b240f90bf3455e031dc5cc230d12fcd2':