Merge API fixes into sasese\stable for merge with pyLoad.