2.1 merge 2.0

This merge was fairly straightforward, but I've done it without any knowledge of the kernel changes where the conflicts were. Could someone Enlightened take a look, please?