Fixes error in template with uninitialized variable
Merge remote-tracking branch 'origin/master'