Fix up all_active_data.
Merge remote-tracking branch 'crowbar/master'