Merge SO/master to SO/projects 98/1598/1
authorPhilip Joseph <philip.joseph@riftio.com>
Thu, 20 Apr 2017 14:06:34 +0000 (14:06 +0000)
committerPhilip Joseph <philip.joseph@riftio.com>
Thu, 20 Apr 2017 14:29:26 +0000 (19:59 +0530)
Change-Id: Id24dd1fb79a9d97b35874a20e3f2b4e3ea686197
Signed-off-by: Philip Joseph <philip.joseph@riftio.com>

Trivial merge