Merge "Merge branch 'security-summit' into 'master'"
authorSachin Agrawal <sachin.agrawal@intel.com>
Thu, 17 Sep 2015 15:56:04 +0000 (15:56 +0000)
committerGerrit Code Review <gerrit@172.30.200.205>
Thu, 17 Sep 2015 15:56:04 +0000 (15:56 +0000)

Trivial merge