Merge branch 'master' into exception_handling