Pull in feature increases and bug fixes from the development branch.