Cleaned up pull request merge.