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