Merge branch 'cris_debug_port_fix' into cris