Merge branch 'hotfix/2.0.8' v2.0.8
authorAnthony Talarico <talarico@gaslightmedia.com>
Thu, 9 Jun 2016 20:05:08 +0000 (16:05 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Thu, 9 Jun 2016 20:05:08 +0000 (16:05 -0400)

Trivial merge