Merge pull request #564 from cshore/pull-request-app-firewall-timedate