Merge remote-tracking branch 'origin/maint-0.2.2' into maint-0.2.3

diff --cc src/common/container.c
Simple merge

diff --cc src/test/test_containers.c
Simple merge