Merged with latest webinterface from oe-aliance