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