Merge branch 'master' of git@github.com:gritzko/swift.git