Merge pull request #980 from Oldiesmann/release-2.1

! Don't complain if the alerts table already exists