Merge branch 'hotfix/1.1.8' v1.1.8
authorAnthony Talarico <talarico@gaslightmedia.com>
Fri, 11 Mar 2016 15:42:16 +0000 (10:42 -0500)
committerAnthony Talarico <talarico@gaslightmedia.com>
Fri, 11 Mar 2016 15:42:16 +0000 (10:42 -0500)
commit9388bf02233bc336143390f1e1d4ffb3fd03269a
treee0d4f6a17a67a85d82a7c435e6c347011f98bf4f
parentc7150f1b0af3a1970c384a0f505e1f3fdab84e1f
parentc78e0ffc5176bac096ec48bc2e884668fad69b27
Merge branch 'hotfix/1.1.8'