add date2 (jdk8 time) support
Merge remote-tracking branch 'origin/master'