apidoc cleanup
Merge commit 'f7a5c29e206fdb06b102e5f7df7a672998e0094f'