Merge remote-tracking branch 'opentk/develop' into develop
authorTzach Shabtay <tzachshabtay@gmail.com>
Sun, 29 Jan 2017 02:17:32 +0000 (21:17 -0500)
committerTzach Shabtay <tzachshabtay@gmail.com>
Sun, 29 Jan 2017 02:17:32 +0000 (21:17 -0500)

Trivial merge