Merge pull request #189 from HRogge/for-14.07

No match.