Fix an @extend trimming bug.

Closes #788.
Merge branch 'stable'
Change the source map comment character from "@" to "#".

Closes #795
Merge remote-tracking branch 'origin/stable' into stable
Merge branch 'stable'
Merge remote-tracking branch 'origin/master'