Update dispersy feature branch