Merge HEAD, branch 'master' of https://github.com/zantonas/swift-management-interface