Composer update (without any actual updates)
Whitespace fix
Merge commit '42fc7af'