graft r5285 to awesome_nested_set 2.1.6 (#7920)

git-svn-id: http://svn.redmine.org/redmine/trunk@12689 e93f8b46-1217-0410-a6f0-8f06a7374b81