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