GNU GENERAL PUBLIC LICENSE Version 3
Merge branch 'master' into dev