Merge remote branch 'uci_upstream_remote/master' into uci_upstream_merge

diff --cc file.c
Simple merge

diff --cc list.c
Simple merge