Merge pull request #154 from HRogge/for-15.05