Merge pull request #1 from SitefinitySDKCI/master

Rebase this branch to master