Merge branches 'release', 'ejd', 'sony' and 'wmi' into release