Version 0.8.6
Merge remote-tracking branch 'origin/master' into doc_configuration

Conflicts:
	index.html