Merge from OSM SO master

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