Merge OpenTkIssue2550 to master