Merge branch 'master' into african-lions