Get some recent fixes from upstream

Include fixes for cursor position issue and "less" parser issue.