Nightly

New pull in from the "unstable" branch.