Merge "Doc updates"
authorMorgan Richomme <morgan.richomme@orange.com>
Wed, 10 Feb 2016 13:25:59 +0000 (13:25 +0000)
committerGerrit Code Review <gerrit@172.30.200.206>
Wed, 10 Feb 2016 13:25:59 +0000 (13:25 +0000)

Trivial merge