Merge branch 'master' into starling-activity-cached