Merge pull request #219 from HRogge/for-14.07