Merge remote-tracking branch 'crypto-current/master'