Merge release 1.11
42 files changed