Merged branch unstable_modifications into fuerte branch. Fuerte now
includes upgrades that have been added since master branch.