Merge pull request #7354 from DougGregor/sr-3842-3.1

[3.1] [SR-3842] Swift 3 compatibility: make '.map(String.init)' type-check