begin merge of devel branch of dispersy