Merge commit 'celt-repo/master'