Merge branch 'develop'
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 13 Mar 2019 18:25:34 +0000 (14:25 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 13 Mar 2019 18:25:34 +0000 (14:25 -0400)

Trivial merge