Pulled from devel into master.