Merge pull request #1 from villagedefrance/master

Merge Master to Branch v1.6.1
Merge pull request #2 from villagedefrance/Overclocked-v1.6.1

Merge pull request #2 from villagedefrance/master