39 Days Ago
merge from minerhatfix