Merge pull request #165 from HRogge/for-15.05