Rebase against alecthomas master fork