Merge branch 'hotfix/1.2.17' v1.2.17
authorAnthony Talarico <talarico@gaslightmedia.com>
Mon, 14 Dec 2015 18:54:27 +0000 (13:54 -0500)
committerAnthony Talarico <talarico@gaslightmedia.com>
Mon, 14 Dec 2015 18:54:27 +0000 (13:54 -0500)
commit63e5f82de4b24f6e0b14e48fe20d75d48bc3bd99
treec13a1ce9feb5cd47dc5bec461087f6fde7831909
parent4552ed8af567f35a69356eabaa1b228c150020d8
parent91f76d856245c82bee59e164c2a3f8a9db012ca0
Merge branch 'hotfix/1.2.17'