Merge pull request #499 from ivanrusso/2.x

Some BugFixes -> Ensure build without errors
Minor changes
Hide delivery time label if there is no time output
Minor fix
Closes #497
Sync with upstream 2.x