Increased timing on auto-complete.
Merge.
0.2.3