Merge pull request #307 from HRogge/for-14.07