am 67d6590d: am 2a547829: Merge "cherry-pick from master: Icf079f5f45b1745a8d54f504e28dbbb52c6f7c96 docs: rewrite resources documentation" into froyo
Merge commit '67d6590d' into kraken
* commit '67d6590d':
cherry-pick from master: Icf079f5f45b1745a8d54f504e28dbbb52c6f7c96