Merge branch 'hotfix/1.0.18' v1.0.18
authorAnthony Talarico <talarico@gaslightmedia.com>
Fri, 7 Oct 2016 19:25:04 +0000 (15:25 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Fri, 7 Oct 2016 19:25:04 +0000 (15:25 -0400)
commitfc727370ee905d65fd255f50fa29add54719d586
treefb6f0a9faac0508893e638aa8e8b5af2a3f15ffd
parent31414ded461d96242a7375dac54abc2158f3ad23
parent32f36062029b119ca572b38409e3f3c391094bec
Merge branch 'hotfix/1.0.18'