Merge branch 'feature/timelyAnthony' into develop
authorAnthony Talarico <talarico@gaslightmedia.com>
Wed, 8 Jun 2016 15:43:33 +0000 (11:43 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Wed, 8 Jun 2016 15:43:33 +0000 (11:43 -0400)

Trivial merge