Update scalr repository

merge upstream changes.