zbar fixed upstream