Merge 11 commits from master