am 54da5b5d: am dd4448ef: am 32189e26: Merge "misc doc bug fixes" into jb-dev

* commit '54da5b5d683e27924eb6573f544616bc217c6c37':
  misc doc bug fixes