Ensure that tmp/logs directory exists
Merge branch 'master' into new-test-setup
Be lenient about point release #s in staging integration specs