Merge branch 'devel' into linux-next