removed unused var
Remove UTF-8 BOM. Fixes #874
Bug with units as part of the selector. Fixes #1332
Merge remote-tracking branch 'upstream/master' into patch-50