Integrated latest changes from SASS version
Integrated latest changes to match SASS version 1.0.4.