Merge commits from jgm:master