Fix docs links
Merge branch 'refs/heads/topic/documentation'

* refs/heads/topic/documentation:
  Docco annotated source code.
  Squashed commit of the following:
  Squashed commit of the following:
Merge remote-tracking branch 'upstream/master'

* upstream/master:
  Fix docs links