Forward merge branch '4.11' (PR #51)