Rebased onto master

@hishimaru Will you please merge this into your fork and then force-push it into the MR on ASDF? I don't seem to be able to push to your branch.