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