Merge branch 'master' into docs/misc-fixes

Author: Vasileios Karakasis

reframe/utility/osext.py

@@ -570,8 +570,9 @@ def unique_abs_paths(paths, prune_children=True):
 
 
 def cray_cdt_version():
-    '''Return the Cray Development Toolkit (CDT) version or :class:`None` for
-    non-Cray systems'''
+    '''Return the Cray Development Toolkit (CDT) version or :class:`None` if
+    the version cannot be retrieved.'''
+
     rcfile = os.getenv('MODULERCFILE', '/opt/cray/pe/cdt/default/modulerc')
     try:
         with open(rcfile) as fp: