Merge master into pdf417_encode