gpl license
Merge remote-tracking branch 'va/master'