bug fix merge upstream

found a fatal crash in the metadata expander.  update on pantagruel if possible.