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