Merge upstream#14

jcarreira wants to merge 1 commit intonsnam:masternsnam/ns-3-dev-git:masterfrom

jcarreira:buf_manjcarreira/ns-3-dev-git:buf_manCopy head branch name to clipboard