am 1c425b65: am b3b34074: am 7b06f9ba: am fa11fd5b: resolved conflicts for merge of 327afffb to lmp-mr1-ub-dev

* commit '1c425b65186bb64b5c5e32194b3db3df4a5378b1':
  Prevent integer issues in ID3::Iterator::findFrame