Merge pull request #1878 from rolfbjarne/have-system