Merge branch master into artist-user-dashboard.