merge the newest stuff from ticket-please branch