Merge branch 'macclane' into macclane-import