Update to 4.6

-contains fixes needed for input mapping to work in 4.6
-NB: suppresses warning C4273