date fixes
auto-merge staging into master