Merge "Merge branch 'plugin-interface' into master"
authorPatrick Lankswert <patrick.lankswert@intel.com>
Mon, 5 Oct 2015 22:11:34 +0000 (22:11 +0000)
committerGerrit Code Review <gerrit@172.30.200.205>
Mon, 5 Oct 2015 22:11:34 +0000 (22:11 +0000)

Trivial merge