Merge branch 'hotfix/1.0.15'
authorAnthony Talarico <talarico@gaslightmedia.com>
Wed, 13 Jul 2016 14:57:25 +0000 (10:57 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Wed, 13 Jul 2016 14:57:25 +0000 (10:57 -0400)

Trivial merge