Merge from SO/master

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