Merge commit 'remotes/trinity/master'