Merge "Merge branch release-2016"
authorRoland Schulz <roland.schulz@intel.com>
Wed, 28 Jun 2017 00:30:46 +0000 (02:30 +0200)
committerRoland Schulz <roland.schulz@intel.com>
Wed, 28 Jun 2017 00:30:46 +0000 (02:30 +0200)

Trivial merge