Merge branch 'develop' into feature/reorganize
authorAnthony Talarico <talarico@gaslightmedia.com>
Fri, 8 Dec 2017 12:48:50 +0000 (07:48 -0500)
committerAnthony Talarico <talarico@gaslightmedia.com>
Fri, 8 Dec 2017 12:48:50 +0000 (07:48 -0500)

Trivial merge