Changed ctrl-b binding to ctrl-q
Merge branch 'master' into linux