Merge 0.13 changes into no-blankies branch

Review by @eed3si9n