Fixing problem when extra fields are included in reference STR table
bringing in changes from mgymrek/lobstr-code
Merge remote-tracking branch 'upstream/master'