Merge "Pass more information to the attribute parsing functions."
am: 7a280cb2f7

* commit '7a280cb2f78961ab245051e777fa354804e5af4a':
  Pass more information to the attribute parsing functions.