Removing demo from hotfix branch
Merge branch 'hotfix'