Post-merge fixup
Add a final newline
Fix build
Merge commit 'pull/2'