Compass filter: added support for --relative-assets option
Merge remote-tracking branch 'origin/pull/615/head'
cleaned up previous merge