Merge SO/master to SO/projects

Change-Id: Id24dd1fb79a9d97b35874a20e3f2b4e3ea686197
Signed-off-by: Philip Joseph <philip.joseph@riftio.com>