Merge branch 'hotfix/1.0.18' v1.0.18
authorAnthony Talarico <talarico@gaslightmedia.com>
Fri, 14 Oct 2016 14:43:24 +0000 (10:43 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Fri, 14 Oct 2016 14:43:24 +0000 (10:43 -0400)
commit4c1ea88bbe2791418dd39ef1aa4e0f91c2a95931
tree607995d734cc798db84e60e45611d1cd055f9c21
parent5a7e2007fddc6eb1e5da160eb47dd22da17f8e0b
parent794f5641e4fdb330f30dafff57f1668bcc99ba32
Merge branch 'hotfix/1.0.18'