Merge commit '0.11.1'