Jstree 3 branch pre-merge