Merge pull request #127 from HRogge/for-14.07