Moved too-early assignment inside the if stmt where the var is actually used. Close gh-1292.
Merge remote-tracking branch 'upstream/master'
fix top and left case for .css