Single line var declarations
Merge branch 'single-line-var-declaration'