Merge pull request #179 from HRogge/for-15.05