swift

81e95852 - Merge branch 'master' into inhibit-implicit-conversions