Merge hoodiehq:promise into eth0lo:promises