master
Merge commit 'a024bc7d76fcc5e49e8210f9b0896db9ef21861a'
Merge commit 'c23d97904fd31ef745bece57133aa1b9275ec20c'
Merge commit '9b0050e9aabe4be65c78ccf292a348f309d50ccd' as 'docs'