Merge pull request #228 from HRogge/for-14.07