IST-109, fixed bug in int conversion
Merge branch 'master' into beta