Merge branch 'feature/updates' into develop
authorAnthony Talarico <talarico@gaslightmedia.com>
Fri, 16 Feb 2018 14:38:06 +0000 (09:38 -0500)
committerAnthony Talarico <talarico@gaslightmedia.com>
Fri, 16 Feb 2018 14:38:06 +0000 (09:38 -0500)

Trivial merge