Merge pull request #486 from dwmw2/for-15.05