Merge branch 'master' into v1.0
[osm/SO.git] / common / python / rift / mano / utils / __init.py__