Up until recently, the roadmap page for 2.1 said that the best of questionnaire, survey and feedback features were going to be combined into a rewrite for the Survey module. It even still alludes to this on the Feedback module page
However, the item for this on the roadmap page disappeared sometime in the last few weeks. Has this been dropped from 2.1? If so why and when is it slated for?