Merge branch 'master' into feature/loadingscreen-refactor

# Conflicts:
#	modules/galaxy/rendering/renderablegalaxy.cpp

support/coding/check_style_guide.py

@@ -308,6 +308,19 @@ def check_line_length(lines):
 
 
 
+def check_line_length(lines):
+    # Disable this check in non-strict mode
+    if not is_strict_mode:
+        return ''
+
+    index = [i + 1 for i, s in enumerate(lines) if len(s) > (90 + 1)]
+    if len(index) > 0:
+        return index
+    else:
+        return ''
+
+
+
 previousSymbols  = {}
 def check_header_file(file, component):
     with open(file, 'r+') as f:
@@ -434,6 +447,10 @@ def check_inline_file(file, component):
             if using_namespaces:
                 print(file, '\t', 'Using namespace found in inline file')
 
+        line_length = check_line_length(lines)
+        if line_length:
+            print(file, '\t', 'Line length exceeded: ', line_length)
+
 
 
 def check_source_file(file, component):