Fixing user_roles data loading SQL, for new installs.
Merge remote-tracking branch 'upstream/master'