Merge pull request #2596 from wsnyder/bug868_let

Fix indentation of `let` (#868) (#2001) (#2348)