turned off extra logging
Merge branch 'master' into 0.5