am 54dd25f0: (-s ours) am a6d71a2c: am 8df6131a: (-s ours) am 50e1406a: am f6b08547: Show better error message for color attr not found. [DO NOT MERGE]

* commit '54dd25f09d08bf4edb785b78160d10fd570bfdaa':