MAGETWO-63983: Merge branch 'develop' of github.com:nickgraz/magento2 into MAGETWO-63983

Author: ishakhsuvarov

app/code/Magento/Sales/view/frontend/email/creditmemo_new_guest.html

@@ -34,7 +34,7 @@
     </tr>
     <tr class="email-summary">
         <td>
-            <h1>{{trans "Your Credit Memo #%creditmemo_id for Order #%order_id" creditmemo_id=$creditmemo.increment_id order_id=$order.incrh1ent_id}}</h1>
+            <h1>{{trans "Your Credit Memo #%creditmemo_id for Order #%order_id" creditmemo_id=$creditmemo.increment_id order_id=$order.increment_id}}</h1>
         </td>
     </tr>
     <tr class="email-information">

app/design/frontend/Magento/luma/Magento_Sales/email/creditmemo_new_guest.html

@@ -33,7 +33,7 @@
     </tr>
     <tr class="email-summary">
         <td>
-            <h1>{{trans "Your Credit Memo #%creditmemo_id for Order #%order_id" creditmemo_id=$creditmemo.increment_id order_id=$order.incrh1ent_id}}</h1>
+            <h1>{{trans "Your Credit Memo #%creditmemo_id for Order #%order_id" creditmemo_id=$creditmemo.increment_id order_id=$order.increment_id}}</h1>
         </td>
     </tr>
     <tr class="email-information">