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