Bring SolarCrane fork up to date with upstream.