This branch has all the latest changes from ging:master, plus some stream recording fixes.