Merge pull request #2273 from xypron/apr