log is needed here, oops
Merge branch 'master' into AWS