Merge branch 'master' into coin-mode