Merge branch 'master' into v1.0
[osm/SO.git] / .cpack-workaround