Merged conflicting branch 'log-roll'