Merge pull request #7457 from practicalswift/gardening-20170214