fix
improved scaling input modifier
Merge remote-tracking branch 'upstream/develop' into develop