Merge PKG_BINARY_MERGE color changes from master.
2 files changed