GPLv3
Merge pull request #1993 from aspangaro/3.6-patch

GPLv3