updating to match devel branch of dispersy