Fix completion before var decls (FML!)
Merge remote-tracking branch 'original_origin/master'