Merge changes from noosfero