Version 1.4
Merge branch 'master' into better_logging