Merge pull request #138 from HRogge/for-14.07