Merge pull request #652 from emmanuel-keller/master

Fix nav links
Merge pull request #655 from emmanuel-keller/master

Improve locking isolation in config
Merge pull request #658 from emmanuel-keller/master

Fix #642
Merge remote-tracking branch 'upstream/master'
GITBook integration