smallint to int
Merge branch 'develop' of github.com:pgRouting/osm2pgrouting into develop