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