Merge branch 'vladimir-kotikov-node6_fix'