Use same licence as jQA: GPL
Merge remote-tracking branch 'origin/master'