Merge from SO/master to SO/projects

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