Merge branch 'master' into feature_gz_reader

plugins/GCodeGzReader/GCodeGzReader.py

@@ -8,13 +8,13 @@ from io import TextIOWrapper
 from UM.Mesh.MeshReader import MeshReader #The class we're extending/implementing.
 from UM.PluginRegistry import PluginRegistry
 
-##  A file writer that writes gzipped g-code.
+##  A file reader that reads gzipped g-code.
 #
 #   If you're zipping g-code, you might as well use gzip!
 class GCodeGzReader(MeshReader):
 
     def __init__(self):
-        super(GCodeGzReader, self).__init__()
+        super().__init__()
         self._supported_extensions = [".gcode.gz"]
 
     def read(self, file_name):

plugins/GCodeGzReader/__init__.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2016 Aleph Objects, Inc.
+# Copyright (c) 2018 Ultimaker B.V.
 # Cura is released under the terms of the LGPLv3 or higher.
 
 from . import GCodeGzReader