Merge commit '0536d11' into mergemeister