it is int again
Merge branch 'soontobe-0.5-master' into develop