Merge pull request #225 from HRogge/for-15.05