fix to use hive conf $NOW
Merge remote-tracking branch 'origin/master'