Some fun forserial.org stuff.
Merge remote-tracking branch 'origin/code' into code

* origin/code:
  Some fun forserial.org stuff.
WIP