Patch everything from PR #306 except riak_core_handoff_manager.erl (which was already fixed)
Merge branch 'gh306-edoc-fixes' into develop