Merge "Merge branch '1.3-rel' (5c831e6)"
authorNathan Heldt-Sheller <nathan.heldt-sheller@intel.com>
Fri, 22 Sep 2017 20:57:23 +0000 (20:57 +0000)
committerNathan Heldt-Sheller <nathan.heldt-sheller@intel.com>
Fri, 22 Sep 2017 20:57:23 +0000 (20:57 +0000)

Trivial merge