Merge pull request #1 from revive-adserver/master

Update fork to current version of master