Merge commit 'aa40b834985023642b30fa2e0563c414a994bd3a' * commit 'aa40b834985023642b30fa2e0563c414a994bd3a': Add some encoding parameters for the "record" utility
Merge commit 'aa40b834985023642b30fa2e0563c414a994bd3a' * commit 'aa40b834985023642b30fa2e0563c414a994bd3a': Add some encoding parameters for the "record" utility