Merge remote-tracking branch 'wakadx/master' into desuchan

And update example config to match.