Merge pull request #1662 from thess/crelay-import