removed artificial mapping of integer type (int.long) to int
Merge branch 'master' into 3.7.1