Merge branch 'plugin-interface' into master 99/2799/1 1.0.0-RC1
authorJoseph Morrow <joseph.l.morrow@intel.com>
Sun, 20 Sep 2015 22:06:56 +0000 (15:06 -0700)
committerJoseph Morrow <joseph.l.morrow@intel.com>
Sun, 20 Sep 2015 22:06:56 +0000 (15:06 -0700)
Change-Id: Idb58ff366694797d8bc433e974faf2c6124091aa
Signed-off-by: Joseph Morrow <joseph.l.morrow@intel.com>

Trivial merge