Merge branch 'feature/uptraSearch' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 24 May 2019 13:06:14 +0000 (09:06 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 24 May 2019 13:06:14 +0000 (09:06 -0400)

Trivial merge