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

Trivial merge