Merge pull request #418 from chris5560/for-15.05