fix up dates
Merge branch 'master' into js-fix-dates
Merge pull request #519 from nla/js-fix-dates

fix up dates