Bunch of misc. stuff.
Merge remote-tracking branch 'origin/working'