update from rcssmin upstream