Merge remote-tracking branch 'origin/macclane' into spartan