Merge branches 'debug-choice', 'devel-stable' and 'misc' into for-linus