Merge branch 'develop' of https://github.com/opentk/opentk into develop
authorShane Kelly <shane.sparky.kelly@gmail.com>
Sat, 9 Dec 2017 07:49:12 +0000 (09:49 +0200)
committerShane Kelly <shane.sparky.kelly@gmail.com>
Sat, 9 Dec 2017 07:49:12 +0000 (09:49 +0200)

Trivial merge