Merge branch 'gl-dev' into HEAD
authormatthew <matthew@owens.tech>
Tue, 6 Nov 2018 19:08:26 +0000 (19:08 +0000)
committermatthew <matthew@owens.tech>
Tue, 6 Nov 2018 19:08:26 +0000 (19:08 +0000)

Trivial merge