zxing update from master