typo fix
formatting fixes
merge fd1ee46c4d60da8267d90a7b7c111e0dbb81e374 to 540796b21a351d0e0205ee56c98ac0ca08ccf9a9 (from 0.11)