Minor tweaks for 1.1.0.0 release
Merge commit '440c1f770ff19224b8361ca7553efbf11edba3cb'