Merge commit '091ca2aa033bf9bf9bfecdc55140d2cd15ed2ccb'
Keeps the library up to date.
Merge commit 'c9dec5da8cb2893219c069f92728fb3997c7d81e'