Fix a comment.
Move over headers first, when building the framework.
Merge branch 'master' into SwiftTest