am 11bdd5b1: Merge commit \'06d8b7b8\' into manualmerge

* commit '11bdd5b10b5f921b657283fa94463263171218d5':
  Implement back-tracking when searching for attributes in XML or resource bag