Merge pull request #1838 from shackbarth/killthebear