SENTRY-496: Sentry 1.5 postgres upgrade script has contains incorrect upgrade file name
Merge remote branch 'upstream/master'