Merge pull request #667 from chris5560/for-15.05