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