Merge "Fix fcntl decoding"