merge changes between nginx 129 and 141, coflicts resovled