0.13.5 merge

I'm seeing some doc updates in pull req lately.