Merge pull request #412 from chris5560/for-15.05