Merge branch 'hotfix/1.2.13' v1.2.13
authorAnthony Talarico <talarico@gaslightmedia.com>
Fri, 7 Oct 2016 19:41:07 +0000 (15:41 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Fri, 7 Oct 2016 19:41:07 +0000 (15:41 -0400)
commit67c3e1bea2708b73d46bd61403cc6586627ef132
treefc389e5c1ad46875ace7e2c911dd798054a929bb
parent94ecc5c6b98ccd85c423e03427fb984a515c68dc
parent9450cdd7717a01cbb05daa0165d8dea1cf10f88a
Merge branch 'hotfix/1.2.13'