Merge commit 'origin/master' into modesetting-gem