Show a color settings page for base attribute if possible
Subversion: correctly assert in parse status test on linux
Merge remote branch 'origin/master'