Merge branch 'master' into wasabiz/refactor/peep-hole