Merge branch 'hotfix/1.0.18'
authorAnthony Talarico <talarico@gaslightmedia.com>
Wed, 13 Jul 2016 19:38:58 +0000 (15:38 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Wed, 13 Jul 2016 19:38:58 +0000 (15:38 -0400)

Trivial merge