Merge changes Ib5727c51,I18510f66 into v1.1
[osm/SO.git] / .cpack-workaround