Pulling release changes into devel branch.