Merge pull request #1118 from sipa/addbreaks