Merge branch 'freespace-4.5' into for-linus-4.5