sync master from hypery2k