Merge pull request #6 from PayBas/ticket/12598

Manually fixed conflicts