am 18d2d51e: am 7ea69880: Merge "Improve some docs, fix some debugging." into lmp-dev

* commit '18d2d51ee30d8df4d3afa5e7b6bb7e7171a18b63':
  Improve some docs, fix some debugging.