The undead pull request

Simple changes to check rebasing with..

<!---
@huboard:{"order":1.5,"custom_state":""}
-->