[devedeng/f25] (2 commits) ...Updated to new upstream release