Merge remote-tracking branch 'github-tokkee/sh/empty-config'