Merge branch 'wireless-devel' into master-devel