Merge commit '0580ea8b675c868685993b0780c9ecc31010f681' into master