#1 updated plugin init
Merge branch 'master' into Link7/automatic-content-spinner
#1 updated plugin init