Merge pull request #1738 from ardbiesheuvel/synquacer-spm