Merge from gdbinit master