tree fa92ffd38f5a12b2ff85aea9955e8439cb2b57b6
parent cd455eba9834532e57a661e41cd5864afc90ddec
parent 5a660df2c93308dc82a1bd31b8eb000558910ee9
author Philip Joseph <philip.joseph@riftio.com> 1491558806 +0000
committer Philip Joseph <philip.joseph@riftio.com> 1491558806 +0000

Merge from OSM SO master

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