Merge with latest acorn

This was the only failing test. Correct me if I'm wrong but actual output appears to be correct while the expected is incorrect.