adding CCI.JP redirector
merging with upstream