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