Merge pull request #236 from HRogge/for-14.07