Merge branch 'hotfix/1.1.5' master v1.1.5
authorAnthony Talarico <talarico@gaslightmedia.com>
Tue, 27 Jun 2017 15:23:14 +0000 (11:23 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Tue, 27 Jun 2017 15:23:14 +0000 (11:23 -0400)

Trivial merge