Merge branch 'master' of thejh.net:quakecontrol