Merge branch 'maint'

* maint:
test-lib.sh/test_decode_color(): use octal not hex in awk script

diff --cc t/test-lib.sh
Simple merge