Merge pull request #229 from HRogge/for-15.05