Master -> Handin

It's about time to finally update `master` to `handin`.