Merge branch 'hotfix/1.6.18' v1.6.18
authorAnthony Talarico <talarico@gaslightmedia.com>
Mon, 6 Mar 2017 13:24:10 +0000 (08:24 -0500)
committerAnthony Talarico <talarico@gaslightmedia.com>
Mon, 6 Mar 2017 13:24:10 +0000 (08:24 -0500)
commitc4f57db759dbf135b9a5171d4a794536da036d5c
treecb4db15e3354d6af4b55201ec08aec35fc2e1194
parent45f2fbed9d9081417aac2f1f4ae784f836ccffce
parente5b48da5f2895b52236c811744e983ab220ae185
Merge branch 'hotfix/1.6.18'