Merge "Merge easysetup branch into master"
authorPatrick Lankswert <patrick.lankswert@intel.com>
Wed, 16 Sep 2015 19:44:50 +0000 (19:44 +0000)
committerGerrit Code Review <gerrit@172.30.200.205>
Wed, 16 Sep 2015 19:44:50 +0000 (19:44 +0000)

Trivial merge