Merge pull request #118 from HRogge/for-14.07