Merge "Fix variable initialization." into jb-dev
Martijn Coenen authored
acc04ecb