Merge branch 'hotfix/1.0.16' v1.0.16
authorAnthony Talarico <talarico@gaslightmedia.com>
Wed, 2 Nov 2016 15:47:24 +0000 (11:47 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Wed, 2 Nov 2016 15:47:24 +0000 (11:47 -0400)

Trivial merge