Merging of upstream master-new-eoxserver