Merge pull request #119 from HRogge/for-15.05