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