Merge pull request #218 from HRogge/for-15.05