fix for CTRL & ALT combinations
fix for alt & ctrl
Merge branch '1.x' into 2.x