Merge branch 'hotfix/1.0.15' v1.0.15
authorAnthony Talarico <talarico@gaslightmedia.com>
Thu, 9 Jun 2016 15:15:49 +0000 (11:15 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Thu, 9 Jun 2016 15:15:49 +0000 (11:15 -0400)

Trivial merge