Targetting RModule 0.4 from yesterday's merge.