Merge changes from samuela/sagenb