Merge pull request #223 from HRogge/for-14.07