Merge branch 'misc-4.10' into for-chris-4.10-20161130