Merge branch 'master' into updates
update core to 7.31
update views
update date module
update backup and migrate
Merge branch 'updates'