Cherry pick aminb trailing slash commit. Closes #60.