From: Johannes Berg <johannes@sipsolutions.net>
Date: Tue, 28 Feb 2017 10:50:18 +0100

First round of fixes - we actually have quite a few.

Please pull and let me know if there's any problem.

Pulled, thanks Johannes.

I had another question - I have this average.h API change pending
(you saw it before). It seems it might be a good time to get it in
now, since no new users should be showing up. If I put it in only
with the next merge window, new users might show up and break.

Ok, you can feel free to send this now for 'net' if you like.