Merge branch 'master' into updates
update date module
update core to 7.30
Merge branch 'updates'