reopen 502539 merge 502539 502346 thanks these bugs should have been merged (502539 was closed without explanation). live well, vagrant