Merge commit '293f264' into 0.6.0.x