Merge pull request #220 from HRogge/for-12.09.x