Update from eXist master.