Merge master into aztec_encode