final 2.1rc1 merges


If there is anything not currently tagged 'release critical' that you think
needs go in for 2.1 please flag it now! If you are not sure, err on the
side of marking it, we can always un-mark it.

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <>