Fix an uninitialized variable warning from clang when compiling for OS X
Merge branch 'uninitialized-variable-fix'