Merge branch 'master' into Updates
update views module
Merge branch 'Updates'