Merge pull request #935 from chris5560/for-15.05