Remove line numbers from code samples as they are not great for copy-pasting
rebase with origin/master