Nothing very exciting, basically minor tweaks and cleanups.

Cheers,
Rusty.
Merge branch 'modules-next' into pending-rebases