Merge branch '7.x-3.x' of github.com:tripal/tripal into 7.x-3.x

tripal_chado/includes/TripalFields/sio__annotation/sio__annotation.inc

@@ -292,7 +292,7 @@ class sio__annotation extends ChadoField {
         'value' => array(
           $vocabulary => $cvterm->dbxref_id->db_id->name,
           $accession => $cvterm->dbxref_id->accession,
-          $definition => $cvterm->definition
+          $definition => isset($cvterm->definition) ? $cvterm->definition : ''
         ),
         'chado-' . $field_table . '__' . $pkey => $linker->$pkey,
         'chado-' . $field_table . '__' . $fkey_lcolumn => $linker->$fkey_lcolumn,