Dual licensing: BSD and GPL3
Merge commit 'd39cda558ed0a1224407433f97f625a0a3ce5a4e'