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