Added changes from httpdocs work (all in changelog)