Rebased PRs


(Daniel Eggert) #1

I've rebased against master and squashed these PRs:

https://github.com/apple/swift-corelibs-foundation/pull/287
https://github.com/apple/swift-corelibs-foundation/pull/306

/Daniel