Merge branch 'hotfix/1.0.17' v1.0.17
authorAnthony Talarico <talarico@gaslightmedia.com>
Fri, 14 Oct 2016 14:14:58 +0000 (10:14 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Fri, 14 Oct 2016 14:14:58 +0000 (10:14 -0400)
commit5a7e2007fddc6eb1e5da160eb47dd22da17f8e0b
treed6d532ccc515d31dd62f2756965deb249f6fbe7f
parentc7045b0f94bd917ed66477c6ec356a5d2939c434
parent6f4804d11456d7844354d4886bae575fc2b6884f
Merge branch 'hotfix/1.0.17'