cosmetics, spacing
cosmetics, whitespace
checking for null value because of #6, can't reproduce #6 on Linux, however
cosmetics, whitespace
Merge branch 'master' into deploy
build 30560