Merge pull request #445 from hnyman/for-15.05