Removed dead code
Rewrapped long line
Removed unnecessary backslash
Merge branch '0.9-maintenance'