Merge branch 'master' into updates
update views module
update ms_core module
update ms_membership module
Merge branch 'updates'