MAGETWO-49549: Merge branch 'patch-4' of git://github.com/liam-wiltshire/magento2 into bugs

Author: ishakhsuvarov

app/code/Magento/GiftMessage/Model/Type/Plugin/Multishipping.php

@@ -32,7 +32,7 @@ public function __construct(
     /**
      * @param \Magento\Multishipping\Model\Checkout\Type\Multishipping $subject
      * @param array|null $methods
-     * @return $this
+     * @return void
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function beforeSetShippingMethods(