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