Fixed always preventing default action on keyup
Merge branch 'options' into develop