Merge branch 'js/ming-strftime'