cbq query timeout doesn't time out on primary index creation

Tried this with a much longer timeout as well, but easy to reproduce with a short one:

[root@ip-10-0-112-85 data]# /opt/couchbase/bin/cbq -u Administrator -t "1s"

Enter Password: 

Connected to : http://localhost:8091/. Type Ctrl-D or \QUIT to exit.

Path to history file for the shell : /root/.cbq_history 

cbq> create primary index on default;

Query monitor shows that the query is in "timeout" state but cbq has not returned. 

Also, CTRL-c kicks you out of the whole cbq process which is a little annoying when all you wanted to do was cancel the running query...is there anyway to catch CTRL-c and cancel the query instead of breaking out of the process?  Or is there a different key combo that will achieve that?