Sync david-geiger/Solaar from pwr/Solaar