merge from 2.0-ongoing by hand, minus key binding editor