Fix showing date fields that are null.
Merge remote-tracking branch 'origin/master'