Merge branches 'pstore-fixes' and 'syscalls2' into release