Merge "Merge branch 'r3' to master"
authorRuan HE <ruan.he@orange.com>
Mon, 23 Nov 2015 09:10:59 +0000 (09:10 +0000)
committerGerrit Code Review <gerrit@172.30.200.206>
Mon, 23 Nov 2015 09:10:59 +0000 (09:10 +0000)

Trivial merge