Don't split a block with @at-root unless necessary.

Closes #1239
Merge remote-tracking branch 'origin/stable' into stable
Merge remote-tracking branch 'origin/stable' into stable
Fix a sass-convert comma-folding bug.

Closes #1257