Merge branch 'for-4.17/elecom' into for-linus