Merge branch 'hotfix/1.1.18' v1.1.18
authorAnthony Talarico <talarico@gaslightmedia.com>
Mon, 31 Oct 2016 19:24:46 +0000 (15:24 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Mon, 31 Oct 2016 19:24:46 +0000 (15:24 -0400)
commitec2dbdb198227db1fbe2354b7eeec4957efac206
treefcca45d0d30812e3382127e3a160a18fa8784b9c
parent15e181de484f7749590fc7d8a92b06b826bda35e
parent873669b2e6786d599d9075cfdfacb471bb8c4cfb
Merge branch 'hotfix/1.1.18'