Merge pull request #200 from HRogge/for-14.07