connectable_singleton now checks magic_id
Authored by: sgrottel 2014-01-01
Parent: [r480]
Child: [r482]