Merge commit '3deca9d'