Merge pull request #199 from HRogge/for-15.05