Merge branch 'develop' of github.com:opentk/opentk into develop
authorvaron <varon@users.noreply.github.com>
Mon, 8 May 2017 20:50:38 +0000 (22:50 +0200)
committervaron <varon@users.noreply.github.com>
Mon, 8 May 2017 20:50:38 +0000 (22:50 +0200)

Trivial merge