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

No match.