Merge in some commits from Fly-Man