Merge pull request #153 from HRogge/for-14.07