Version 3.6.6

Usual by-weekly deal
Revert "Version 3.6.6"

This reverts commit 32231638827bc871e50fa036ba0fadeada6881b4.
Version 3.6.8
Merge remote-tracking branch 'origin/master'