Merge gdb/master -> archer/master, and archer/master -> archer-tromey-python

[Phil Muldoon]

I needed a clean diff against archer-tromey-python so I went ahead and
merged. There were a few minor/simple config conflicts in
archer-tromey-python so I fixed those.

Cheers,

Phil