Merging changes derived from merge of branch-1-0 from forked ngeo repository