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

Trivial merge