typo fix
formatting fixes
merge f3a9793cf7dc52a3162ebac01f52aa682a72143a...219b6afc9f9f37a189425dd3c59fd56a58fb5568 (from 0.11)