Merge upstream changes: clean css up
Bump package version to v1.1.2.4