Released 0.8.6
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'origin/master' into doc-private-vars

Conflicts:
	codox.core/project.clj
	codox.example/project.clj
	codox.leiningen/project.clj
	project.clj