Stuff we didn't do until next release.

(from redmine: created on 2012-06-19)