Rebased to latest master.
Merge pull request #2235 from thedax/master

User controllable CPU speed option