Scaling of spontaneous imbibition data with wettability included.