Fix setting timeouts in 1.2+
Merge branch 'master' of github.com:pcmanus/ccm
Set back apache git repository