Merge pull request #3476 from lambdageek/fix-conc-ht