Merge branches 'topic/core' and 'topic/stats' of git://git.kernel.org/pub/scm/linux...