make sure clock and /etc/hosts are accurate
Merge branch 'dev' into production