Merge in new Core

Tiger merged the webadmin stuff straight into master, so this goes in the pile too...