Merge commit 'rusty/signal-fix'