Merge branch 'master' of https://github.com/mecharage/Gwift.git