Merge remote-tracking branch 'quazarcoin/master'