merge
Merge commit 'origin/master'
Clean up sites directory