merging in changes from linux