Merge pull request #1080 from hhofbaue:matchTemplate_bugfix