Merge latest commits from freenet/fred branch next