Merge pull request #5194 from xmcclure/orbis-freeswept