Merge pull request #1134 from bendiy/no-rest-for-you