Merge unnamed.xach.com:~/git/vecto into gradient-cruft