Merge branch 'hotfix/1.0.20' v1.0.20
authorAnthony Talarico <talarico@gaslightmedia.com>
Fri, 14 Oct 2016 15:45:33 +0000 (11:45 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Fri, 14 Oct 2016 15:45:33 +0000 (11:45 -0400)
commita252c89f67fd4171b2a4d740918d99e8ebfb6447
tree64f60ff4ad544993f2c9f6dd4545335218a554c7
parent7d9fcbbf4255ba35fe6c7ceefc7046aa14ab5bba
parente09055d5c0cfe0c89fd543ac9d2906f2c7d63c04
Merge branch 'hotfix/1.0.20'