Fix heredoc in db patch #963 #1002
Add 'all' role to all users #1004
Merge branch 'master' into production