Another 1.8.7 fix
Another 1.8.7 fix

rvwong/netzke-basepack,skmitty/netzke-basepack,rvwong/netzke-basepack,skmitty/netzke-basepack,rvwong/netzke-basepack,skmitty/netzke-basepack,citrininfo/netzke-basepack,skmitty/netzke-basepack,citrininfo/netzke-basepack,citrininfo/netzke-basepack,citrininfo/netzke-basepack,rvwong/netzke-basepack