Wip/merge 0.13.5

Review by @eed3si9n  (merged 0.13.5 into 0.13)