Renamed Core.Type.User to Core.Type.Security because it fits better.
Merge remote-tracking branch 'origin/master'