fix #912, search box ctr keys doesn't work by fm.error triggering
Merge branch '2.x' into 2.1
Merge branch '2.1' into 2.1_n