Merge commit 'c31513a'
Merge branch 'master' into beta